psalm does not complain here but PsrLoggerAdapter needs to be adjusted. Will do so, but that psalm ignores it is weird...

psalm does not complain here but PsrLoggerAdapter needs to be adjusted. Will do so, but that psalm ignores it is weird...

We’d need psalm level 3 I think

Regarding psr/log

composer installed psr/log 2 because all our dependencies does support it now.

We could also enforce psr/log 1 here and update psr/log in a follow-up pr.
For example to also adjust classes wrapping the Logger like ScopedPsrLogger.

main:

composer why psr/log
doctrine/dbal             3.8.3   requires  psr/log (^1|^2|^3)             
sabre/dav                 4.5.0   requires  psr/log (^1.0 || ^2.0 || ^3.0) 
symfony/console           v5.4.35 conflicts psr/log (>=3)                  
symfony/mailer            v5.4.22 requires  psr/log (^1|^2|^3)             
web-auth/metadata-service v3.3.9  requires  psr/log (^1.1)                 
web-auth/webauthn-lib     v3.3.9  requires  psr/log (^1.1)  

this branch:

composer why psr/log
doctrine/dbal             3.8.3   requires  psr/log (^1|^2|^3)             
sabre/dav                 4.5.0   requires  psr/log (^1.0 || ^2.0 || ^3.0) 
symfony/console           v5.4.35 conflicts psr/log (>=3)                  
symfony/mailer            v5.4.22 requires  psr/log (^1|^2|^3)             
web-auth/metadata-service 4.8.5   requires  psr/log (^1.0|^2.0|^3.0)       
web-auth/webauthn-lib     4.8.5   requires  psr/log (^1.0|^2.0|^3.0)  

Message: Webauthn\AuthenticatorSelectionCriteria::__construct(): Argument #2 ($requireResidentKey) must be of type ?bool, string given, called in /var/www/html/lib/private/Authentication/WebAuthn/Manager.php on line 109 in file '/var/www/html/apps-extra/twofactor_webauthn/vendor/web-auth/webauthn-lib/src/AuthenticatorSelectionCriteria.php' line 55

Once merged, we need to log an issue for Christoph and Richard to also update the shipped copy in twofactor_webauthn to avoid conflicts.

It doesn't work on my machine. Do I need to do something else other than check out this branch and disable twofactor_webauthn?

totp app has a different version of that lib installed:
https://github.com/nextcloud/twofactor_totp/blob/0a05055ee2caab5169d0c40c3467592443739887/composer.lock#L471

If I enable totp with installed deps it also doesn't work for me anymore.
So temp fix disable totp and make sure it has an aligned version at the end of the cycle

the stream of conflicts is troublesome.
Would be better if frontend rewrites (js to ts) could be split of on the next php lib bumps.
But as you have the reviews already, can you rebase and then we get this in quickly, so we can continue bumping the remaining PHP libs?

Would be better if frontend rewrites (js to ts) could be split of on the next php lib bumps.

Yes but in this case without fixing the frontend, server would not work because the custom implementation was using invalid encoding that conflicts with the RFC and webauth-lib dropped support for anything not RFC compliant.
As this would have needed a lot of changes anyway using Typescript did not make much of a difference here.

But as you have the reviews already, can you rebase and then we get this in quickly, so we can continue bumping the remaining PHP libs?

Sure, I just wanted to wait for someone (Daniel) to test it with real hardware as I only have software keys.

I tested with a hardware device and passwordless authentication worked (if TOTP app is disabled)

Rebased and using merge commit ✅

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!